bitkeeper revision 1.1159.1.201 (41600e1fkVMoQU0dVgk1h6vT502hEg)

Merge

diff --cc tools/libxc/xc_linux_restore.c
index d42293aff0125120de8decfdd9db6668e7dbfa1f,0988055af34b981b9f77bbb9e01126f9ef7956a4..3973c8522589ff6b47456ca6dc0214726a7e8db3
--- 1/tools/libxc/xc_linux_restore.c
--- 2/tools/libxc/xc_linux_restore.c
+++ b/tools/libxc/xc_linux_restore.c
@@@ -243,6 -245,18 +243,15 @@@ int xc_linux_restore(int xc_handle, XcI
      }
      shared_info_frame = op.u.getdomaininfo.shared_info_frame;
  
 -    if ( (pm_handle = init_pfn_mapper((domid_t)dom)) == NULL )
 -        goto out;
 -
+     if(ioctxt->flags & XCFLAGS_CONFIGURE)
+     {
+         if(xcio_configure_domain(ioctxt))
+         {
+            xcio_error(ioctxt, "Configuring domain failed"); 
+            goto out;
+         }
+     }
+ 
      /* Build the pfn-to-mfn table. We choose MFN ordering returned by Xen. */
      if ( get_pfn_list(xc_handle, dom, pfn_to_mfn_table, nr_pfns) != nr_pfns )
      {